From d7ab0a78d1fc152d8f4803fb4a1ff384edb4f4ec Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 22 Aug 2005 21:31:56 +0000 Subject: [PATCH] Many source files. Ensure calls to 'fatal' end in \n. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@1365 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/gdb.c | 4 ++-- gpsbabel/jeeps/gpslibusb.c | 6 +++--- gpsbabel/jeeps/gpsserial.c | 2 +- gpsbabel/jeeps/gpsusbwin.c | 4 ++-- gpsbabel/maggeo.c | 2 +- gpsbabel/mapsend.c | 2 +- gpsbabel/mapsource.c | 10 +++++----- gpsbabel/reverse_route.c | 2 +- gpsbabel/smplrout.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.c index 834d9de58..2db870f5d 100644 --- a/gpsbabel/gdb.c +++ b/gpsbabel/gdb.c @@ -156,7 +156,7 @@ gdb_find_desc_from_icon_number(const int icon, garmin_formats_e garmin_format) return i->icon; break; default: - fatal(MYNAME ": unknown garmin format"); + fatal(MYNAME ": unknown garmin format.\n"); } } return DEFAULTICONDESCR; @@ -190,7 +190,7 @@ gdb_find_icon_number_from_desc(const char *desc, garmin_formats_e garmin_format) case GARMIN_SERIAL: return i->pcxsymnum; default: - fatal(MYNAME ": unknown garmin format"); + fatal(MYNAME ": unknown garmin format.\n"); } } } diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c index bf76d1b5e..7121b6423 100644 --- a/gpsbabel/jeeps/gpslibusb.c +++ b/gpsbabel/jeeps/gpslibusb.c @@ -91,7 +91,7 @@ gusb_cmd_send(const garmin_usb_packet *opkt, size_t sz) if (r != sz) { fprintf(stderr, "Bad cmdsend r %d sz %d\n", r, sz); if (r < 0) { - fatal("usb_bulk_write failed. '%s'", + fatal("usb_bulk_write failed. '%s'\n", usb_strerror()); } } @@ -156,12 +156,12 @@ garmin_usb_start(struct usb_device *dev) udev = usb_open(dev); atexit(garmin_usb_teardown); - if (!udev) { fatal("usb_open failed"); } + if (!udev) { fatal("usb_open failed\n"); } /* * Hrmph. No iManufacturer or iProduct headers.... */ if (usb_set_configuration(udev, 1) < 0) { - fatal("usb_set_configuration failed"); + fatal("usb_set_configuration failed\n"); } if (usb_claim_interface(udev, 0) < 0) { diff --git a/gpsbabel/jeeps/gpsserial.c b/gpsbabel/jeeps/gpsserial.c index d1ced3440..918423ade 100644 --- a/gpsbabel/jeeps/gpsserial.c +++ b/gpsbabel/jeeps/gpsserial.c @@ -213,7 +213,7 @@ int32 GPS_Serial_Write(int32 ignored, const void *obuf, int size) } WriteFile (comport, obuf, size, &len, NULL); if (len != (DWORD) size) { - fatal ("Write error. Wrote %d of %d bytes.", len, size); + fatal ("Write error. Wrote %d of %d bytes.\n", len, size); } return len; } diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.c index 44f15ddda..7362caf9c 100644 --- a/gpsbabel/jeeps/gpsusbwin.c +++ b/gpsbabel/jeeps/gpsusbwin.c @@ -124,7 +124,7 @@ gusb_open(const char *pname) if(!DeviceIoControl(usb_handle, IOCTL_GARMIN_USB_BULK_OUT_PACKET_SIZE, NULL, 0, &usb_tx_packet_size, GARMIN_USB_INTERRUPT_DATA_SIZE, &size, NULL)) { - fatal("Couldn't get USB packet size"); + fatal("Couldn't get USB packet size.\n"); } if (pdd) { @@ -192,7 +192,7 @@ gusb_cmd_get(garmin_usb_packet *ibuf, size_t sz) if(!DeviceIoControl(usb_handle, IOCTL_GARMIN_USB_INTERRUPT_IN, NULL, 0, buf, GARMIN_USB_INTERRUPT_DATA_SIZE, &rxed, NULL)) { GPS_Serial_Error("Ioctl"); - fatal("ioctl"); + fatal("ioctl\n"); } buf += rxed; sz -= rxed; diff --git a/gpsbabel/maggeo.c b/gpsbabel/maggeo.c index 382719d82..719ea0aab 100644 --- a/gpsbabel/maggeo.c +++ b/gpsbabel/maggeo.c @@ -68,7 +68,7 @@ maggeo_wr_deinit(void) static void maggeo_read(void) { - fatal("Not implemented yet."); + fatal("Reading maggeo is not implemented yet.\n"); } /* diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c index fa538c342..40b7e97c1 100644 --- a/gpsbabel/mapsend.c +++ b/gpsbabel/mapsend.c @@ -481,7 +481,7 @@ void mapsend_track_hdr(const route_head * trk) case 20: verstring = "30"; break; case 30: verstring = "34"; break; case 40: verstring = "36"; break; - default: fatal("Unknown track version."); break; + default: fatal("Unknown track version.\n"); break; } hdr.ms_version[0] = verstring[0]; diff --git a/gpsbabel/mapsource.c b/gpsbabel/mapsource.c index 0a913cc88..0ba7bd83b 100644 --- a/gpsbabel/mapsource.c +++ b/gpsbabel/mapsource.c @@ -101,7 +101,7 @@ le_fwrite64(void *ptr, int sz, int ct, FILE *stream) unsigned char cbuf[8]; if ((sz != 8) || (ct != 1)) { - fatal(MYNAME ": Bad internal arguments to le_fwrite64"); + fatal(MYNAME ": Bad internal arguments to le_fwrite64.\n"); } le_read64(cbuf, ptr); @@ -187,7 +187,7 @@ mps_find_desc_from_icon_number(const int icon, garmin_formats_e garmin_format) return i->icon; break; default: - fatal(MYNAME ": unknown garmin format"); + fatal(MYNAME ": unknown garmin format.\n"); } } return DEFAULTICONDESCR; @@ -221,7 +221,7 @@ mps_find_icon_number_from_desc(const char *desc, garmin_formats_e garmin_format) case GARMIN_SERIAL: return i->pcxsymnum; default: - fatal(MYNAME ": unknown garmin format"); + fatal(MYNAME ": unknown garmin format.\n"); } } } @@ -267,7 +267,7 @@ int mps_converted_icon_number(const int icon_num, const int mpsver, garmin_forma return icon_num; default: - fatal(MYNAME ": unknown garmin format"); + fatal(MYNAME ": unknown garmin format.\n"); } return def_icon; } @@ -1802,7 +1802,7 @@ mps_read(void) fread(&reclen, 4, 1, mps_file_in); reclen = le_read32(&reclen); - if (reclen < 0) fatal (MYNAME ": a record length read from the input file is invalid. \nEither the file is corrupt or unsupported"); + if (reclen < 0) fatal (MYNAME ": a record length read from the input file is invalid. \nEither the file is corrupt or unsupported.\n"); /* Read the record type "flag" in - using fread in case in the future need more than one char */ fread(&recType, 1, 1, mps_file_in); diff --git a/gpsbabel/reverse_route.c b/gpsbabel/reverse_route.c index 9589c7450..5ba3a7e32 100644 --- a/gpsbabel/reverse_route.c +++ b/gpsbabel/reverse_route.c @@ -48,7 +48,7 @@ reverse_route_init(const char *args) case trkdata: break; default: fatal(MYNAME ": This filter only works in track " - "or route (-t or -r) mode."); + "or route (-t or -r) mode.\n"); } } diff --git a/gpsbabel/smplrout.c b/gpsbabel/smplrout.c index cfffe54ff..bd9fb8dcd 100644 --- a/gpsbabel/smplrout.c +++ b/gpsbabel/smplrout.c @@ -240,7 +240,7 @@ routesimple_init(const char *args) { count = atol(countopt); } else { - fatal( MYNAME ": You must specify a maximum size for the new route"); + fatal( MYNAME ": You must specify a maximum size for the new route with 'count' option.\n"); } } -- 2.30.2